Merge changes from topic "appfuse-upstr"
am: a2786c1f53

Change-Id: I398f823f9221f5632e70c9ff82807200833f818d