Change-Id: I16347ebee0f82d5fdf32f5aa8f955c07fe148eba
Slightly cleanup the code by removing the old and dangerous --force option. Change-Id: I776633a9924797fcd509b8b80623bcd64b391672
Change-Id: Ie857b82e25de235c8549defab7e75995efefb3f6