Merge changes from topic "robolectric_bp"
am: 60cb35018d

Change-Id: Id3fa91b5af8ffa304a81e00b15b910c499c4b60c